(ido-make-merged-file-list): Fix last change again.

diff --git a/lisp/ido.el b/lisp/ido.el
index a0308e3ddfbc725bd94647778baa04dca5896ab7..233474fd0a0287fd3c17c03716de1d767455f592 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2511,6 +2511,7 @@ for first matching file."
     (if (and res (not (eq res t)))
        (setq res (ido-sort-merged-list res auto)))
     (when (and (or ido-rotate-temp ido-rotate-file-list-default)
+              (listp res)
               (> (length text) 0))
       (let ((elt (assoc text res)))
        (when (and elt (not (eq elt (car res))))